Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Vaguely named consumer structs (backport #1288) #1418

Closed
wants to merge 1 commit into from
Closed

refactor: Vaguely named consumer structs (backport #1288) #1418

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2023

This is an automatic backport of pull request #1288 done by Mergify.
Cherry-pick of df12b7e has failed:

On branch mergify/bp/release/v3.2.x/pr-1288
Your branch is up to date with 'origin/release/v3.2.x'.

You are currently cherry-picking commit df12b7e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/consumer-democracy/app.go
	modified:   proto/interchain_security/ccv/consumer/v1/query.proto
	modified:   proto/interchain_security/ccv/provider/v1/genesis.proto
	modified:   proto/interchain_security/ccv/provider/v1/query.proto
	modified:   proto/interchain_security/ccv/v1/shared_consumer.proto
	modified:   tests/difference/core/driver/setup.go
	modified:   tests/integration/setup.go
	modified:   x/ccv/consumer/keeper/genesis.go
	modified:   x/ccv/consumer/keeper/genesis_test.go
	modified:   x/ccv/consumer/keeper/keeper.go
	modified:   x/ccv/consumer/keeper/params.go
	modified:   x/ccv/consumer/module.go
	modified:   x/ccv/consumer/types/genesis_test.go
	modified:   x/ccv/consumer/types/params_test.go
	modified:   x/ccv/consumer/types/query.pb.go
	modified:   x/ccv/provider/keeper/genesis_test.go
	modified:   x/ccv/provider/keeper/keeper.go
	modified:   x/ccv/provider/keeper/key_assignment_test.go
	modified:   x/ccv/provider/keeper/proposal.go
	modified:   x/ccv/provider/keeper/proposal_test.go
	modified:   x/ccv/provider/types/consumer.go
	modified:   x/ccv/provider/types/genesis.pb.go
	modified:   x/ccv/provider/types/genesis_test.go
	modified:   x/ccv/provider/types/query.pb.go
	modified:   x/ccv/types/genesis.go
	modified:   x/ccv/types/params.go
	modified:   x/ccv/types/shared_consumer.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testutil/ibc_testing/specific_setup.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@bermuell @mergify
refactor: Vaguely named consumer structs (#1288)
baffeac 
* Rename GenesisState proto
* make proto-gen
* proto rename: Params -> ConsumerParams
* make proto-gen
* App, fix type change for Param renaming
* App, fix type change for GenesisState renaming
* Fix unit-tests for GenesisState renaming
* Fix unit-tests for Params renaming
* Addressed review comments
* Fix linter issues

(cherry picked from commit df12b7e)

# Conflicts:
#	testutil/ibc_testing/specific_setup.go
@mergify mergify bot requested a review from a team as a code owner November 13, 2023 12:35
@mergify mergify bot added the conflicts label Nov 13, 2023
@github-actions github-actions bot added C:Testing Assigned automatically by the PR labeler C:x/consumer Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler C:x/types Assigned automatically by the PR labeler labels Nov 13, 2023
@mpoke mpoke closed this Nov 13, 2023
@mergify mergify bot deleted the mergify/bp/release/v3.2.x/pr-1288 branch November 13, 2023 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bermuell bermuell

Labels
C:Testing Assigned automatically by the PR labeler C:x/consumer Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler C:x/types Assigned automatically by the PR labeler conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mpoke @bermuell